From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 9 Feb 2016 22:23:10 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~3707
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a9650e970d9f515b4b64bd0009d28125b4276b63;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

35cbe20 src/process.c Correctly convert AF_INET6 addresses
---

a9650e970d9f515b4b64bd0009d28125b4276b63